From 27d5db7ec80aa7603632a3151d8736d4728a5e92 Mon Sep 17 00:00:00 2001 From: Robert Lipe Date: Fri, 2 Jun 2017 18:01:57 -0500 Subject: [PATCH] Keep the Windows-style icons in dialog OK and cancel only in Windows. --- gui/advdlg.cc | 2 ++ gui/filterdlg.cc | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/gui/advdlg.cc b/gui/advdlg.cc index cf32bc580..334e16c7e 100644 --- a/gui/advdlg.cc +++ b/gui/advdlg.cc @@ -39,8 +39,10 @@ AdvDlg::AdvDlg(QWidget* parent, ui_.synthShortNames->setChecked(synthShortNames); ui_.previewGmap->setChecked(previewGmap); ui_.debugCombo->setCurrentIndex(debugLevel+1); +#if defined (Q_OS_WIN) ui_.buttonBox->button(QDialogButtonBox::Ok)->setIcon(QIcon(":images/ok")); ui_.buttonBox->button(QDialogButtonBox::Cancel)->setIcon(QIcon(":images/cancel")); +#endif // Q_OS_WIN connect(ui_.buttonBox, SIGNAL(accepted()), this, SLOT(acceptClicked())); connect(ui_.buttonBox, SIGNAL(rejected()), this, SLOT(rejectClicked())); } diff --git a/gui/filterdlg.cc b/gui/filterdlg.cc index b0784474e..2351a2ed3 100644 --- a/gui/filterdlg.cc +++ b/gui/filterdlg.cc @@ -59,9 +59,10 @@ FilterDialog::FilterDialog(QWidget*parent, AllFiltersData &fd): QDialog(parent), connect(ui_.helpButton, SIGNAL(clicked()), this, SLOT(helpX())); connect(ui_.resetButton, SIGNAL(clicked()), this, SLOT(resetX())); - +#if defined (Q_OS_WIN) ui_.buttonBox->button(QDialogButtonBox::Ok)->setIcon(QIcon(":images/ok")); ui_.buttonBox->button(QDialogButtonBox::Cancel)->setIcon(QIcon(":images/cancel")); +#endif ui_.filterList->setCurrentRow(lastPage_); -- 2.30.2